Phase 2 of GW development #1117
Open
+709
−40
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cacraigucar
added
enhancement
Merge pull request ESCOMP#1147 from jedwards4b/timestamp_in_rpointer_name
Merge pull request ESCOMP#1203 from brian-eaton/misc06
cacraigucar
commented
Jan 28, 2025
Comment on lines
+136
to
+137
| !!$OMP PARALLEL NUM_THREADS(horz_num_threads), DEFAULT(SHARED), PRIVATE(nets,nete,hybrid,ie,ncols,frontgf_thr,frontga_thr) | ||
| ! hybrid = config_thread_region(par,'horizontal') |
There was a problem hiding this comment.
Have these been tested?
|
|
||
|
|
||
|
|
||
| !++jtb (12/31/24) |
There was a problem hiding this comment.
OK to remove these comments?
| @@ -3906,6 +3909,10 @@ if ($do_gw_rdg_beta) { | |||
| add_default($nl, 'gw_prndl'); | |||
| } | |||
|
|
|||
| if ($do_gw_rdg_resid) { | |||
| add_default($nl, 'effgw_rdg_resid', 'val'=>'1.0D0'); | |||
There was a problem hiding this comment.
Should we be consistent and set this via namelist_defaults?
Comment on lines
+1326
to
+1328
| <entry id="use_gw_rdg_resid" type="logical" category="gw_drag" | ||
| group="gw_drag_nl" valid_values="" > | ||
| JULIO - need to add comment |
There was a problem hiding this comment.
Need to describe this
Comment on lines
+379
to
+384
| !++ jtb (12/24/2024) | ||
| ! This is confusing. Not sure when if ever this was needed. | ||
| ! Check if fcrit2 was set. | ||
| !call shr_assert(fcrit2 /= unset_r8, & | ||
| ! "gw_drag_readnl: fcrit2 must be set via the namelist."// & | ||
| ! errMsg(__FILE__, __LINE__)) |
There was a problem hiding this comment.
Remove this now?
Comment on lines
+164
to
+165
| end if | ||
| if ( source_type==2 ) then |
There was a problem hiding this comment.
Could else if to save checking when source_type==1
| @@ -419,15 +432,20 @@ pure function index_of_nearest(x, grid) result(idx) | |||
| end function index_of_nearest | |||
|
|
|||
| !!!!!!!!!!!!!!!!!!!!!!!!!!! | |||
| pure function shcu_flux_src (xpwp_shcu , ncol, pverx, alpha_gw_movmtn ) result(xpwp_src) | |||
| subroutine shcu_flux_src (xpwp_shcu , ncol, pverx, alpha_gw_movmtn, xpwp_src, steering_level, launch_level ) !! result(xpwp_src) | |||
| !!! use gw_common, only: pver | |||
|
|
||
| !!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| subroutine vorticity_flux_src (vorticity , ncol, pverx, alpha_gw_movmtn, vort_src, steering_level, launch_level ) !! result(xpwp_src) | ||
| !!! use gw_common, only: pver |
| real(r8) :: scale_factor | ||
| integer :: k, nlayers | ||
|
|
||
| steering_level = pverx - 20 !++ ????? |
There was a problem hiding this comment.
Comment - remove?
| @@ -265,6 +299,22 @@ subroutine d_p_coupling(phys_state, phys_tend, pbuf2d, dyn_out) | |||
| deallocate(frontgf_phys) | |||
| deallocate(frontga_phys) | |||
| end if | |||
| !++jtb 01/20/25 | |||
| if (use_gw_movmtn_pbl) then | |||
| !$omp parallel do num_threads(max_num_threads) private (lchnk, ncols, icol, ilyr, pbuf_chnk, pbuf_vort4gw) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1115